Proper symlink handling for layers and projects #60140
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Great to see such care in describing the PR and writing the tests, thank you ! |
🪟 Windows buildsDownload Windows builds of this PR for testing. 🪟 Windows Qt6 buildsDownload Windows Qt6 builds of this PR for testing. |
vsydorov
force-pushed
the
fix_symlinks
branch
from
9a6a7a0 to
758d093
Compare
- Prevent QGIS from silently resolving symlinks in qgspathresolver.cpp - Respect symlink for “%_attachments.zip” companion file in .qgs project - Ensure consistent resolution of the project path - Add new tests to verify good behaviours in common symlink scenarios - Fix formatting
vsydorov
force-pushed
the
fix_symlinks
branch
from
758d093 to
54d33e6
Compare
|
Previously I've covered cases when project file and layer file were symlinks. Now this handles consistently the final possibility: when project folder is a symlink. Added an appropriate test testSymlinks6ProjectFolder(). Squashed and rebased to latest master. This passes all the CI workflows on my repo clone, could someone please approve the workflows here? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
This PR addresses #60135 and #19524 issues involving the incorrect handling of symlinks in QGIS when saving projects. There are two main contributions:
In
qgspathresolver.cpp, two calls toQFileInfo::canonicalFilePath()are replaced withQDir::cleanPath(fi.absoluteFilePath()). When saving layer datasources, QGIS this preserves relative paths without inadvertently resolving symlinks."%_attachments.zip"component of a .qgs project.QGIS deletes and recreates the .zip on each project save, removing the symlink if one exists. This PR ensures the symlink’s target is deleted and recreated instead, aligning with expected behavior when editing a symlinked file.
Several tests cover various symlink scenarios::
git-annex.Disclaimer: While not many users will write to broken symlinks or use symlinked project files, this PR ensures QGIS behaves consistently on Linux systems. These fixes benefit users who rely on symlinks for dynamic data, distributed storage, or large-file workflows like git-annex.
Related PR: A complementary fix in qgspathresolver.cpp is submitted under #60109. Please consider merging them together and backporting to the latest version. These are very simple fixes.